Merge "Fix CTS failure for waterfall device"