am: 2e032b74 -s ours * commit '2e032b74': Import translations. DO NOT MERGE Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f