Import translations. DO NOT MERGE am: 05a48e2a3d  -s ours
am: edbd698183  -s ours

Change-Id: Ia21b544c178b56f1d45c674c34ae4407d5cf123c