Merge "Use MCC value to always override channel count setting" into eclair