Merge "Add keepalive related methods and fields to system APIs"