Merge "Fix 'bmgr restore'" into froyo