Merge "Make failure to set addrgenmode a non-fatal error." am: 9c170157 am: 97e7afe8 am: 856a8873 am: d8c0e9f2 Change-Id: Iae28dd9448ad6efdc51b80637ba9c9ce8bd66d43