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

* commit '0a03658ecaefdef4fb5cd6bf38b1112808a8a5d0':
  Revert "Remove AccountsTester"