Merge "Skip properties file on policy CSITs"