Android 6.0.1 release 22
am 917d4984: (-s ours) am ae4f6218: (-s ours) Import translations. DO NOT MERGE

* commit '917d49841591805a7d045ec2bd62332b67ad0faf':
  Import translations. DO NOT MERGE