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

* commit '0935e8d73136ad42462c3b16f73dc202d4d1f471':
  Fix offset adjustment when skipping off-spec meta chunk