Merge "Use the new scan API for manual network search." am: 38e65295fe am: 22b365898f
am: 86c21db95c  -s ours

Change-Id: I8450833fb383c043859d9b65cefbe672cff844c4