Import translations. DO NOT MERGE am: 77de41624f  -s ours
am: 50a1c5c4f9  -s ours

Change-Id: Ic380b06286978a3773b5885d71db7e8584cf647c