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

Change-Id: If13af1a50c9bb12c85559c9c7a83d0e861d76d09