Android 5.1.1 release 1
am 62691568: (-s ours) am 5fe0d63f: (-s ours) Import translations. DO NOT MERGE

* commit '62691568539d22ccdb0b558e362d2beda8b43b29':
  Import translations. DO NOT MERGE