Merge "Fix issue #28118215: Crash during system boot due to null carrier apps"...
Merge "Fix issue #28118215: Crash during system boot due to null carrier apps" into nyc-dev am: f260d2ef
am: eb20a32f
* commit 'eb20a32f':
Fix issue #28118215: Crash during system boot due to null carrier apps
Change-Id: If6b1d4091f48fd888e14435455674af43cb32fc3