Merge "Merge "Handle mnc 00 while retrieving the Resources based on subid"...
Merge "Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4d am: 92979713" into nyc-mr1-dev-plus-aosp
am: 4470010d
* commit '4470010d':
Change-Id: Iec0f7335b60ab5060ea01a31d15127101e29e5ed