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

* commit '97d59c2df3418b1ff6733bb3fd2dc69567cead3b':
  Revert "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version.""