Android 6.0.1 Release 53 (MTC19X)
am 81aa20eb: (-s ours) am 21699347: (-s ours) Import translations. DO NOT MERGE

* commit '81aa20eb68f897cf8bea7ed9e29f4a3a5b6ec212':
  Import translations. DO NOT MERGE