Android 6.0.1 release 68
am 8d256562: (-s ours) am 8e773d9e: (-s ours) Import translations. DO NOT MERGE

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