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

Change-Id: I9b719ddc913dfaeab2ae13b61dc0ffe96f26b252