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

Change-Id: I2fe990c0b1559b478669784a354208c4a75cf111