Merge "Fix cannot create Nat-T keepalive on mobile data"
am: c5bc106d53

Change-Id: Ic0f168be6f5a6263a5e0565b6381dcb5c645660f