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

Change-Id: I1403993a36922c3a9b1e18a5dc2168b678bd7154