Android 6.0.0 release 12
am b3c5a4bb: Fix crash on invalid channel config

* commit 'b3c5a4bb8442ab3158fa1f52b790fadc64546f46':
  Fix crash on invalid channel config