Merge "Handle both null and empty string for package name in carrier rule."...
Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev am: 946fe8e0
am: 49fd0724
* commit '49fd0724':
Change-Id: Ie2052713650e9d7754da1b0dd3867bca065b5ba4