Merge "Partially revert package freezing" into mnc-dev