am: 2130b287 -s ours * commit '2130b287': Import translations. DO NOT MERGE Change-Id: Ib9e163aa0e74fdd6c9b22c292e9651d153e117a4