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

Change-Id: I8a9d698e2b8be06ffa8433dbdce81e673130cde8