Merge "Fix overrides for BridgeResources." into mnc-dev