Merge "Address read barrier issue with cl/106467"