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

Change-Id: If90e1b691bff1ae6f6a13c59836ad210df38f6d6