am 0c89977b: Merge "Fix Manifest behavior with Manifest-Version/Signature-Version."

* commit '0c89977b802a4f43ca3a4d0007d0f22ab5d1057e':
  Fix Manifest behavior with Manifest-Version/Signature-Version.