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

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