Merge "Remove some hdmi ro properties"