DO NOT MERGE - Slightly better encapsulation for the set of recent activities am: 6abecd2c2a
am: b1d7726419  -s ours

Change-Id: I1ea668b992243b9c08729ba5b184cbbc3eb901c3