Import translations. DO NOT MERGE am: a54b679f2a  -s ours
am: 1d4aff76fa  -s ours

Change-Id: I4da76a2efef8385e4c3bdd70374cc4f07c8f68b8