Merge "Use the new scan API for manual network search."
am: 38e65295fe

Change-Id: I242955a50e70d51616e0b77853fe3b8b237c5883