This fixes a regression in 10/12 bit encoding results. Change-Id: I438877352a41aae0a864a8d9979afe4aa2061d81