Merge "Support removing AVB public keys"