Import translations. DO NOT MERGE
am: 0c1f10dd0c  -s ours

Change-Id: Ia455a09086cac4a22b87591901562cf8e8ccf433