Merge "Fix deleting Misc channel for o-aps" into oc-dev am: a906fb7b43
am: 635e4efa1c

Change-Id: I97ca05aff7bea5d0d99d19d29d17bdc00c8381be