Android 5.1.1 release 34
am ba335c5b: (-s ours) am 3689cdd7: (-s ours) Import translations. DO NOT MERGE

* commit 'ba335c5bef552002e502b76aa311e5a06b5940d3':
  Import translations. DO NOT MERGE