Import translations. DO NOT MERGE
am: 6173d397d2  -s ours

Change-Id: Idd232011cfc3dbd334f9f9c949d5f3699cebeaf1