am 50566b35: Merge change 2816 into donut

Merge commit '50566b3554f440d6b84a696875147d8d21682b10'

* commit '50566b3554f440d6b84a696875147d8d21682b10':
  Update reliability test code. Use a separate activity with simpler calback mechanism.