Import translations. DO NOT MERGE am: df2c2f7020  -s ours
am: ab072976da  -s ours

Change-Id: I5b1e14f70beff03e1016dd8db6a6535dbdcae3a3