Import translations. DO NOT MERGE am: d3af5d4c94  -s ours
am: 39c730b0b7  -s ours

Change-Id: Ife6e6f7e4b83d1aac4a13a8d7e3ac2a03cd1d468