Merge "Merge "Increases TC Logging Visibility for testing" into oc-dr1-dev am: f69a9c9dc6" into oc-dr1-dev-plus-aosp
am: 3f6af5d5b6

Change-Id: Ic86b7c0fbea0e5de8fbd3c7b8561d54fb2f32940