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

* commit '7f319c47c8f5e947638eb1e5e73789ff83123bba':
  Fix packing of values at offset 16.