This change is needed until upstream fixes the wifi hal Change-Id: Ie8c7b0df204d2274b3b0624ee5a9f47976c7fb20