Import translations. DO NOT MERGE am: 212cda9a9a  -s ours
am: e2dac2cd85  -s ours

Change-Id: I2ae406406b26f10c863eda8338e1c68da30754b7