Merge "cutils: update property_get to use diagnose_if." am: 5c655991f5
am: f5a677a7d3

Change-Id: I39671d3f090f605d2f9ba3636c342ab5ee46c6bc