Merge "Close CTS ResultReporter streams" into oc-dev