Merge "Cleanup the code for TBBR CoT descriptors" into integration