Merge "Remove AccountsTester" into nyc-dev
am: ac6ca9c2e6

* commit 'ac6ca9c2e63c5ac628d0933ae9399c4d7d4fcde3':
  Remove AccountsTester