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

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