Android 6.0.1 release 25 (MTC19T)
am 612161f6: (-s ours) am 3315c12c: (-s ours) Import translations. DO NOT MERGE

* commit '612161f6899aee29a5b1a6e1ace794cbfdb4be96':
  Import translations. DO NOT MERGE