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

Change-Id: Icd7d81b0c3b6bc6b38502ca9a16e5f366602d8f1