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

Change-Id: If22a74559b3dd5ad0cd2dc7dd12becf2e0b1e59e