Merge "Change to not cache user entered apn type as user may change it."