Merge "Refine TC request classes." into rvc-dev am: 031fe36d am: 0ae02f61 am: 8884a769 am: 97beec86 Change-Id: I74d79007187f1dd8f3b5ecf98045fd4e860c2264