Uses highbd_ prefix convention consistently. Change-Id: I58f7f799a7ff8e32701bcd71c955bcf1cdd4581e
Change-Id: Ie51c352a6b250547207cbc1ebba833a01ed053e3