Android 6.0.1 release 68
am 879da353: (-s ours) am e57e462a: (-s ours) Import translations. DO NOT MERGE

* commit '879da353b6869c126e095d8f7bba5d351ca87432':
  Import translations. DO NOT MERGE