Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9