Merge "Make failure to set addrgenmode a non-fatal error." into oc-dr1-dev