Merge "[AWARE] Add support for SDEA.ServiceInfo field"