Merge "Moar UserManagerTest improvements:"