Android 6.0.1 release 8
am dcb985ea: (-s ours) Import translations. DO NOT MERGE

* commit 'dcb985eafe0a20e2cdc36c1882ef7104a22829ec':
  Import translations. DO NOT MERGE