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

Change-Id: I9841bc9640c203a4b7d6698eddedbee7b8b24a8a