Merge "Remove some unused cutils/properties.h references"