am 66b96b42: am 3144eec0: (-s ours) Replace the implementation of this class.

* commit '66b96b42ba1d21027b71ca65821648925c661a78':
  Replace the implementation of this class.