Merge "Enhanced network scan request"
am: 8e5f008ae6

Change-Id: I8903402f50c64b475ccda3839f0175fb2eaa12f6