Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
am: eabafd5ceb

Change-Id: Ic3003fa5482446f361faa01aec1b709e40954173