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

Change-Id: I15921c5f5903d66052cb48d851913672077a190c
tree: 2fda5c3d7c2f9f6c0ac7b70e7b30fc1aac89e527
  1. service/