Merge "Don't update routes if Dhcp fails." into jb-mr2-dev