Import translations. DO NOT MERGE
am: 36c3a4556e  -s ours

* commit '36c3a4556e883870d5ac1c2b006199b88d41ea68':
  Import translations. DO NOT MERGE

Change-Id: If1b435143b95a8472dcbcbfe595cd64234d58edc