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

* commit '33ed6da55f6376282a8416079a5a977fd132a5e5':
  Update config loader to use CONFIG_SERVICE_INTERFACE