Merge "Fix UserManagerTest#testSwitchUser."