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

Change-Id: I5cc209e05eb91a368c94f76efc961ba5fd2750fb