Android 5.1.1 release 25
am a9cf884e: (-s ours) am ddacd6ac: (-s ours) Import translations. DO NOT MERGE

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