Import translations. DO NOT MERGE
am: 98d4aea6e1  -s ours

Change-Id: If13c10dffd0a476f2f4c3d8ac718cc1e7c0ef232