Merge "Clean up when we switch networks." am: be2d0e890d

Original change: undetermined

Change-Id: I694c4f3fe74a6af5000fcd1520b63023cb7830c4