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

Change-Id: Ide3e67921fb2f1751c74e03d05d7eb7b83d26dca