Merge \"Perform a null-check in getMatchingConfig\" into mnc-dev
am: e3c37daf73

Change-Id: Ic33a155d3f19e39279a7d8b47ee63da217539c47
tree: 49daa713b250679814e682fc9dc30bdbde39e827
  1. service/