Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf992 am: cb2860362b
am: 35d9ddf06d  -s ours

Change-Id: I4a971e6010049e8afc44d4c122405ec09f892f89