Merge \\"Perform a null-check in getMatchingConfig\\" into mnc-dev am: e3c37daf
Paul Stewart authored
am: e1809380

Change-Id: I15921c5f5903d66052cb48d851913672077a190c
96cc4860