Merge "fix is_secret_key_operation check"