Import translations. DO NOT MERGE
am: 2a2856e023  -s ours

Change-Id: I82c4e746ee7757593fa35798c065eeba5b356ae3