Merge "Enhanced network scan request" am: 8e5f008ae6
am: b49cd63a75

Change-Id: I9af2ebbaf19f6963518f89c6e8a481d7017b4558