Import translations. DO NOT MERGE am: d3e147527d  -s ours
am: a7f5d2661a  -s ours

Change-Id: I2cce4175bb2c0b5d0c17ab060f8a0b2bd80fc33f