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

Change-Id: Iad2bb88eb8336c20cd7389fb2e90b8cf415cd67d