Merge "Use non-deprecated login in ApiLoginTest"