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

Change-Id: Ia8b9a24f73c302dbd38dc220968424f3683ad742