Complete the logic around last active user, including: am: f4339b8cb1
am: 69b063d7a7

Change-Id: Idc1180b1ced53f08ee5e396561f980c7d3b8028b