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

Change-Id: Ia2a9663fbb6daaa4f133e3a3e55295ed9d20fc0b