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

Change-Id: Ied661795a18352f805bedaaf0ac974ae006cbbb2