Merge "Migrate the NetworkSelection settings" am: 35659d9346
am: 1d95e4c43a

Change-Id: I0eb5bb21af71a30b78f973922240feac724cb112