am d22a6b47: Merge "Remove timer tests."

* commit 'd22a6b47204f7866039049fba566fc8c75598ff0':
  Remove timer tests.