Merge "[AWARE] Add support for SDEA.ServiceInfo field" am: 97c3540042
am: d57bae0f76

Change-Id: Ib55c7df302c9c3b01ae36ce52dce0470ff4f0cf1