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

Change-Id: Ia1f7426a2f75ed6e6264a932255f77e707968165