Merge "[AWARE] Remove Publish/Subscribe Count configuration" am: 5d81b9d67d am: 9bc8e05da2 am: 342a27e7f7
am: b36a9e0eb5

Change-Id: I0c4f93b03a73e169da7250b1cf7e5cc1269d4f07