Import translations. DO NOT MERGE
am: f0f669876e  -s ours

Change-Id: Ic90e8cd489ebdba8bf773b848b66ccd1f4f68641