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

Change-Id: I5276632980c373a0bc1861915a10cecf29b6cce1