DO_NOT_MERGE: Update CSIT tests 161002 -> 161017