Merge "Add bmgr command to enable/disable auto restore"