Merge change 7157

* changes:
  Grant adb the BACKUP permission