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

Change-Id: If4a6fe668a70c13ea264e07daec3798fe1a93111