Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5 am: f5a677a7d3 am: 2bf647ae24 am: c3bc295f11
am: 7f59fe0a53

Change-Id: I8f0cbaa399bbbf696ab0079225d99fd6af0e2627