More changes to match more with a known CM10.2 HDMI