am dc0cad90: am 23d4a742: Revert "Revert "Refactor GoogleKeymaster\'s operation table to a new class.""

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