Merge "Revert "Refactor GoogleKeymaster's operation table to a new class.""