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

Change-Id: Iaf546e0c8e5d3ebb9d7d5671871b6c583e9fcf03