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

Change-Id: Ib986b70036410e4ad561a724263a078117d0b09d