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

Change-Id: I2370bea69898bff71d366ca358574f4b3e5a21be