am d6103319: am aeeaa64f: Replace the implementation of this class.

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