Import translations. DO NOT MERGE
am: 10caff8a09  -s ours

Change-Id: I78d756ed3ef7ba858dceccecef421acbe1adbdbe