Merge "Wifi: revise WIFI off deferring constant name" into rvc-dev am: 580f82768c

Change-Id: I8ba9fd6e3c07708940e73f31c77371aa11a7312d