Merge branch '2365-android-nat-keepalive'