Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev