Merge "Move the guard definition ENABLE_VENDOR_CLUSTER_PROPERTY_FOR_TESTING." into sc-dev