Android 6.0.1 release 67
am 4768cae3: (-s ours) am 09c3547a: (-s ours) Import translations. DO NOT MERGE

* commit '4768cae30bb14a7c47dc47c2431362e949ad08bc':
  Import translations. DO NOT MERGE