Merge "Enhance network scan request" am: b9f49e671a am: d5987f9722 am: c1333187cd
am: c788882471

Change-Id: Ie155d930b8a21c826fb8a034beb53dfec111ff4b