Merge "Update set last active user to exclude ephemeral users." into pi-dev am: c3cb52abdb
am: 09da434a60

Change-Id: I9b54c28eae2f34f17347dce35e619f1db710008e