am ab48bb9c: Merge change 4686 into donut

Merge commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de'

* commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de':
  Set AuthType to 0 if username is not specified.