am f97f4578: am 16065ce5: Merge "Pay attention to string offset and count fields."

* commit 'f97f4578f027286b6a86dabb4426dcb0937d8513':
  Pay attention to string offset and count fields.