[automerger skipped] Always check whether given channel config is supported. am: 25b209f229
am: 1ef3f5d620  -s ours

Change-Id: I5d82544a16e2df854fe383aaf8d54d2b1986d19f