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

Change-Id: I157f74635519dde6f971d1c4b5b4bb00997a574f