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

Change-Id: Ifaa64e0a91ff05d13db23845ab6f9b50fd191983