Import translations. DO NOT MERGE am: 1fbd148ce4  -s ours
am: 6319a10819  -s ours

* commit '6319a1081929ad4d9050e89abbca4bcd6f6ffd16':

Change-Id: I58353e3a0792624750b9703b39058efdac66d61c