Merge "Patch to eliminate sleeps in RemoteRpc tests"