Merge "cec: Fix breakage due to API change"