Merge change 2816 into donut

* changes:
  Update reliability test code. Use a separate activity with simpler calback mechanism.