Import translations. DO NOT MERGE am: 870fa8fec7  -s ours
am: dced4fac97  -s ours

Change-Id: Ibf449d4d434dde933f408f91c3d7fc3c65b4c8b2