Import translations. DO NOT MERGE
am: 3d3e712873  -s ours

Change-Id: I2c8e3e0264c0240b0738f4da2a70ba4310efa213