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

Change-Id: I39fab67cade7cc11932a7e0feb4b23c729898c88