Merge "CTS: Refactoring CL" into rvc-dev am: 74675352b4 am: ef709fd309 am: 54aaecbe10 am: 2c14f9cc83

Change-Id: Id128f97a5f7327a68fa7a996842820ff6889bcd3