Merge "Enhance network scan request"
am: 0cd7ef0e6d

Change-Id: I42f16c6c7f574986c9813b9078f5178eb757bf41