Android 5.1.1 release 1
am 2d64aeb0: (-s ours) Import translations. DO NOT MERGE

* commit '2d64aeb05bd3bd9474717137ef611ea2101a1864':
  Import translations. DO NOT MERGE