Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo