Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev