MFA: Fixed Issue: XAuthToken contains MFA passcode

* Broke my own best practices, and did not use keywords in arg signatures.
  Had extra parameters that should not have been included.
* Removed unnecessary conditional that overwrote XAUthToken.

Change-Id: I65ad528e4ad0c0350767702a176d12a2267cf841
Merge "MFA: Fixed Issue: XAuthToken contains MFA passcode"