Merge "SDNC Naming Policy CSIT tests"