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

Change-Id: I83d33a57d6dac950b14d6f2f7ee89aa54c1809fc