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

Change-Id: Ieeee69556c5d4462cc1b721075498d6cbf6721f9