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

Change-Id: I44773d0592aa076a3dc14b0ffafbffd6b83aacbd