Merge "Perform a null-check in getMatchingConfig" into mnc-dev
tree: ba8bb159348d2c708407938d033fb2c8e3eb7893
  1. service/