Import translations. DO NOT MERGE am: c3bf78b1ea  -s ours
am: 1304f3b36a  -s ours

Change-Id: Ifc9347d1e756cb9c9e25881fe89f61c484a2f34c