Android 5.1.1 release 6
am 86799f35: (-s ours) Import translations. DO NOT MERGE

* commit '86799f35a692eea051b1cb223b454f307c4ba2f2':
  Import translations. DO NOT MERGE