am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit '52d3312abeafd988ecb2288896b74ba72c3e70c0':
  Make ResourceKey always use non-null configuration override.