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

Change-Id: I22b616c5e9af8091179226e074eac5a869ce2c67