Merge "Ignore ipv6 tx traffic on clat uid."
am: bd73798585

Change-Id: I181c3c812caa9bcd359fbddf74d14adeb7e83419