Import translations. DO NOT MERGE am: 7f427c090c  -s ours
am: 46d771107c  -s ours

* commit '46d771107c088ade184a6918068c7b168c0d936f':

Change-Id: Icbeb97d8263c48d87a000c89fedb78bddf9c7963