Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev am: 2ce80c839e -s ours
am: 4e158866f8 -s ours
Change-Id: I4e056cfa17e44bcbbcc017208588effa398fa36f
This commit is contained in: