Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157a8
am: 97e7afe8d0

Change-Id: Icadae1e993287fd54e3c5f96b6773d713b8a1e6e