Merge "Remove spurious WTF in rematching networks."
am: fba50df582

Change-Id: If2dc54d1486fe51a1800c140fd83811492e4134b