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

Change-Id: Iae9d523d364079407f500d00f96db951c3d7f994
tree: 939e8964dc4d176094805d064e5a7ac62a43b426
  1. service/