am bbebe423: Merge "adb backup/restore fixes" into lmp-dev

* commit 'bbebe42309a7012e0474b916f5209027889e8d57':
  adb backup/restore fixes