Merge "Fix CTS failure caused by ag/16284012"