Merge "Fix to only do pre boot receivers on upgrade." into mnc-dev