Merge "DO NOT MERGE - Ensuring that there are per-user last stack active times." into nyc-mr2-dev am: e0e08f3f41
am: 0c09549ef4  -s ours

Change-Id: I1c45cfdd676e4c58825f3600cc0c3edec199bd59