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

Change-Id: Ib939563246c8ff709e8c2d5e867548a98f81cc8f