am 1dc550fa: Merge "Fix packing of values at offset 16."

* commit '1dc550fa7333257a130d71866be37181f8ee553b':
  Fix packing of values at offset 16.