am 257062f7: am 4dfb9107: Merge "Revert "Refactor GoogleKeymaster\'s operation table to a new class.""

* commit '257062f7cf0c8bf330b197f05f43c741151f5621':
  Revert "Refactor GoogleKeymaster's operation table to a new class."