Import translations. DO NOT MERGE am: 12ab4e9a48  -s ours
am: f5ac811f2a  -s ours

Change-Id: I62aa71f013295501676caba7f3030a0365f914e8