am 0cbbfb2b: am 7640d989: CEC: Fix a regression bug
automerge: 5b972d5

* commit '5b972d58cb9ccbbbc3302655f83b04ddd717c299':
  CEC: Fix a regression bug