Import translations. DO NOT MERGE am: 6956a426da  -s ours
am: d20c8d7fdb  -s ours

Change-Id: I4e17a1faff827abe81caf7b79a462e5c9c21af4b