Import translations. DO NOT MERGE
am: 3f12495742  -s ours

Change-Id: If2153aa4692097ba2cdee319e3d77d1043dfe7c9