Merge "Fixed ContentCaptureSession javadoc."