Merge "Handle device config service(s) in platform and mainline"