Android 6.0.1 release 12
am 8f85e85d: (-s ours) Import translations. DO NOT MERGE

* commit '8f85e85d24648f55d2a18538045f52626cc83fd9':
  Import translations. DO NOT MERGE