Merge "Revert "Revert "Fix Manifest behavior with Manifest-Version/Signature-Version."""