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

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