Merge "Updated CTS test for b/120426980" into rvc-dev