Merge "Fix offset adjustment when skipping off-spec meta chunk"
am: 7e9b93421e

* commit '7e9b93421ef9b9839320d98887c2cc0ac50b71a1':
  Fix offset adjustment when skipping off-spec meta chunk