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

Change-Id: Ic3c7286bfa4876754c3deca6cce0cecb92ae4a6d