Merge "Remove CHECK in AdjustEncodedValue."
am: d76bd4c8d0

Change-Id: Ifa0352a04ecc47a0d60460a6c8dda07e50d9e98b