Merge "Remove CHECK in AdjustEncodedValue."