Merge "Process the NetworkInfo before updating AccessPoints."