Android 6.0.1 release 24
am 253f19bf: (-s ours) am fab9ee32: (-s ours) Import translations. DO NOT MERGE

* commit '253f19bff86f3b7760a2d1aba5f6a0862d1dec30':
  Import translations. DO NOT MERGE