Merge \"Adding debugging for last active time.\" into nyc-mr1-dev
am: d6c332b01a

Change-Id: Ie79a7b46e73eb8ecaa29ddc73b43f4ce214b1695