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

Change-Id: I383aec927ed10303eb5262c9fc8d7b723132845d