Merge "DO NOT MERGE - Slightly better encapsulation for the set of recent activities" into nyc-mr2-dev am: c7f90bfb4f
am: ced2abbc7b  -s ours

Change-Id: I4fb6c67a6d7c30325046caf2adfab4e23eeaf2ff