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

Change-Id: If70290bcea12d646ddb44ea1a635b197b82eebe6