Merge "Fix issue #28118215: Crash during system boot due to null carrier apps" into nyc-dev