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

Change-Id: I1e6622b5d481938c1f5df8f4964284ef56c34cc3