Merge "Separates current process user and foreground user" into pi-dev
am: a512d304ca

Change-Id: Id876cfb4c06ffae5f2268fb53a6cfaddfd15bd4d