Import translations. DO NOT MERGE
am: 782f3d7c49  -s ours

Change-Id: Id0e1b0467460904a82c2888af565d0ce7066ac36