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