Merge "CEC: Change device type checks"