Merge "Switch back user to the initial user in teardown()."
am: e1dca16fcd

Change-Id: I24e2575fa271669c7e73168071e41110bcd52d23