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