Fix automatic set of wgAuth

Change-Id: I33b157e28d1ad928aa204fda3287bf10c0f95ceb
(cherry picked from commit e04f380dbabab0b6b2ff803399091d4505412235)