Merge "Make ResourceKey always use non-null configuration override." into mnc-dev