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

Change-Id: Ia6d1ce107c784dd42b8c1a7ad83dc0f8bd7b6ddb