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

Change-Id: I2365ca83a9522ca86d85f4dbc1c51c2350d8a6f6