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