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