Merge "Fix QS wifi scan state" into oc-dr1-dev am: ce099ba8bc
am: 9b08d7758b

Change-Id: Iec7997260ffc57eb7016e71189af1854bc8e3015