Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Add Usage and Diagnostics to main screen
  Fix NPE in storage migration settings

Change-Id: Id970ce5613769debd77c0adcb2f6f9ef4a956d1f