Android 6.0.1 release 21
am 809d6c96: (-s ours) am a4d171f3: (-s ours) am 76d7877c: (-s ours) Import translations. DO NOT MERGE

* commit '809d6c96ab7606b838acdaf544ec495df3888b0a':
  Import translations. DO NOT MERGE