Merge "cec: Fixes for 8994"