Merge "Refine TC request classes." into rvc-dev am: 031fe36d am: 94903244 am: 5c5425a8 am: 881a0b52 Change-Id: I1c2baa06b3b0abf8efeca52782aa0d1ece451129