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

* commit '78c164c2386a24c6ea4455883a54acbbc20056e9':
  Fix offset adjustment when skipping off-spec meta chunk