Merge "Allow codepath changes for new OTA packages" into mnc-dev