Merge "Improve keepalive offload documentation and error handling" am: cc3a190b07
am: 7bb0014975

Change-Id: Iae2c4dfcfa2695a57ed54eb93c64eac54f18cf98