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

* commit '3ad0caffbb78b8fe838c6c8d8c7a2d1bcf1fcc06':
  Fix offset adjustment when skipping off-spec meta chunk