am 48caff24: Merge "Revert "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version."""

* commit '48caff24e226480232f4ace7f9f8fbd7705946dd':
  Revert "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version.""