Merge "Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev am: 37c26e4 am: 9297971" into nyc-mr1-dev-plus-aosp
am: 4470010

* commit '4470010de00bacd37d1ebba9b53e8256c7867f9d':

Change-Id: Iec0f7335b60ab5060ea01a31d15127101e29e5ed