Explicitly check that wiki is specified in TwoStepUsernameQuery

Change-Id: Icfa0d947429f16f3ac004d41d6c8c94c2eed8795
Merge "Explicitly check that wiki is specified in TwoStepUsernameQuery"