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

Change-Id: I8516b98c1c989d11b45e4f3058d217fd22c5dff5