Merge "Default apn ip type to ipv4" into nyc-dev