Merge "[AWARE] Add service support for SDEA service info"