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

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