Merge "Update javadoc for startProxyOp"