Merge "Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am: 11cea0d4a3 am: a80d8de804 am: 98bd5591b6 am: 3b6de6e6db"