Merge "Change default IP protocol preference from AUTO to IPV4" into udc-dev