am bd94c10e: am b7e0dbc5: am 33ed6da5: Merge "Update config loader to use CONFIG_SERVICE_INTERFACE" into mnc-dev

* commit 'bd94c10e7a0f3fcab346a8de078e90ec963db0de':
  Update config loader to use CONFIG_SERVICE_INTERFACE