Import translations. DO NOT MERGE am: 97be70c0ba  -s ours
am: 9c0aaace68  -s ours

Change-Id: I2a54bf1ffb4ceae261e8fd8642726bb459e30e51