Merge "conman:  Update previous scan results."