Merge "Remove non-existent OPTF CSIT trigger jobs"