Merge "Remove some hdmi ro properties" am: 5bfe628d am: 4a52b8ee am: 885c7ef7 am: 9f443b26 am: ca497443 Change-Id: I0ea2f7e71ecf89473a0c7d8db68bc85f1d040ab4