Merge "Rename withIPv6AddrGenMode{Type}() methods to using{Type}MacAddress()" am: 6d14940a0e
am: 93052429e0

Change-Id: I9ecce595354bafba65df8d63e868be73d91b9503