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

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