Merge "Fix SocketKeepalive APIs which do not meet API review requirement"