Merge "Fix CTS" into rvc-dev am: cf8ab8447e am: f9df81c4b5

Change-Id: Id73ba9a576883cda713c969217789ac0f5ed0bac