See 123322c6d6 for the NM-side fix. We need this too for the systemd code. (cherry picked from commit e47eca8761)
123322c6d6
e47eca8761