Merge "Update last active user." into pi-dev
am: d50321314e

Change-Id: I703c701e55c4279a2b24718eedd24a7d120347a7