Import translations. DO NOT MERGE am: c16d222593  -s ours
am: 5dac1e08ea  -s ours

Change-Id: Ic2750e22865b1f053548a66aad3ad7ca2cd58ea9