Merge "Allow non-persistent manual network selection." into mnc-dr-dev