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

Change-Id: Ifb781febbb687036b15746f809499788b802566b