Merge "Log NAT update descriptions when receiving netlink errors"
am: 3506aaf992

Change-Id: I3a37cf51b0763e42752d35fc26f70c63d3707fae