Merge "Adding missing dependencies of CTS modules batch 6" into tm-dev