am 75d0695b: am f28aa55e: Merge "Fix issue with older structure sizes"

* commit '75d0695b6a56faa0cea3e11676b6dca587890560':
  Fix issue with older structure sizes