Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-dev am: 78c164c238 am: 0935e8d731
am: 570364ddbf

* commit '570364ddbf85ed99ac909d534b1a966de5b20b73':
  Fix offset adjustment when skipping off-spec meta chunk