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