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

Change-Id: If16c79d6b999a413f991234907cd92403269c8a8