Import translations. DO NOT MERGE am: b64355fe05  -s ours
am: e1a87e4288  -s ours

Change-Id: Ie863a452b8c0f2f4448002a97285ba736a1b073c