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

* commit '149818a2f7fb1df8822a8083a5033ebd3e0e72dc':
  Fix offset adjustment when skipping off-spec meta chunk