am 15c8c3eb: Merge "Support adding, deleting, and clearing IPv6 addrs."

* commit '15c8c3ebf060c57cb165322cd498958cf9112d8b':
  Support adding, deleting, and clearing IPv6 addrs.