Fix a bug introduced in a previous patch on highbd Change-Id: Ice692334f75157446a44a6e81503cada977934f4