Android 5.1.1 release 19
am ed298a3b: (-s ours) am 37327a1f: (-s ours) Import translations. DO NOT MERGE

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