am fb96abd: Bring timetest back.

Merge commit 'fb96abdcfc53dc0c4ff0450c0afd192d6ba570c1'

* commit 'fb96abdcfc53dc0c4ff0450c0afd192d6ba570c1':
  Bring timetest back.