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

* commit '93e0cbb1c2d34f5ba3af704f4f62dd3fe1a73b1d':
  Replace the implementation of this class.