Merge "Enhance network scan request"
am: b9f49e671a

Change-Id: If24d4740c346761391213f94647c43cbd742444a