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

Original change: undetermined

Change-Id: Ib08dfe369c595c3f7ecc87e9fd743f0512435ffd