Merge tag 'android-5.0.2_r1' into merge_branch

Android 5.0.2 release 1

* tag 'android-5.0.2_r1':
  deb: Disable diag device in normal mode.

Change-Id: I137ffc5d302b9205a28766b8e9fb6c07829bee49