Merge "[AWARE] Add capability info: max subscribe addresses" am: 2bfad0cf82 am: 1265f81d3d
am: b19e68fd60

Change-Id: Iaca625bfa6753d5ab62f70c0d233fbc319700ed2