Comment 16 for bug 1533631

I have filed a separate ticket on this for ubuntu 16.04 and cherry-picked the linked fix and tested.
https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1969901

I didn't see this ticket before I filed my ticket.