Android 6.0.1 release 21
am 9efc0c32: (-s ours) am 3231367c: (-s ours) Import translations. DO NOT MERGE

* commit '9efc0c32bf5e94b79d584169a30efcd7b30d67a9':
  Import translations. DO NOT MERGE