Merge "Replace fields with getters in keepalive API"