Merge "Remove CHECK in AdjustEncodedValue." am: d76bd4c8d0
am: c96963391e

Change-Id: If4a3e57f56e3d8bf8f6af8a58472927a32de6e53