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

Change-Id: Iae28dd9448ad6efdc51b80637ba9c9ce8bd66d43