Merge "Deprecate account-specific activity subclass"
am: b7c5d354fb

Change-Id: Ie21ab07bfe7f857c642e62b11e33085db199a021