Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
am: e6bf4f808d

Change-Id: Ie81e000348bd6a4e247c40681202965285f2584c