am aeeaa64f: Replace the implementation of this class.

* commit 'aeeaa64fb691606d39bd24305001a4f4c71acdc3':
  Replace the implementation of this class.