Merge "Fix CTS failure for waterfall device" into sc-v2-dev