Merge "cutils: update property_get to use diagnose_if."