Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am: 6d14940a am: 93052429 am: 37c8698c Change-Id: Ifae53ba606a45b988706f9153e1163294e375607