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

Change-Id: I27e642652eba497533a7059cfe0dd03549def379