Merge "Remove adb shell bmgr restore <package>"