am deacff1b: am 27f9b5dd: Merge "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version.""

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