Android 6.0.1 release 21
am 32531e01: (-s ours) am 9ef49eca: (-s ours) Import translations. DO NOT MERGE

* commit '32531e01a27e56cd2bbe045237c98de1b4e3ab4a':
  Import translations. DO NOT MERGE