Merge "Cherry-pick 'Fix a tiny bug in NetworkScanRequest'"
am: 122a7b33ad

Change-Id: I5acb34ef6d16fd5eab73951811d220049b60a988