Merge "Always set NetworkInfo objects to available." am: ac916d6e2b

Change-Id: I89b53d1a254ca43566286b1309ce88b8a1518c4a