[automerger skipped] Merge "Switch back user to the initial user in teardown()." am: e1dca16fcd am: 06589f0504
am: e84fdca289 -s ours
am skip reason: change_id Ifd2a1bb9a31516fb7ae4d6e826ba54db8bbe1bde with SHA1 f0b1f54db8 is in history

Change-Id: I5687526e6e452a1ec4425a757320725bf3891d56