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

Change-Id: I070cac8b02ff1d6d03c4d8329ca7d2d5f390cda2