Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev