Merge "Revert "RpcSession attaches/detaches JVM for Java thread""