Merge "remove unnecessary switchUser call"