Merge "Revert "Remove AccountsTester"" into nyc-dev am: 0a03658eca
am: b75df06030

* commit 'b75df060301fa191db85d129bcbb5dfcc5d35b39':
  Revert "Remove AccountsTester"