Merge "adb backup/restore fixes" into lmp-dev