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

Change-Id: Icac1607008336c8170dfcb9b161b80ea97fc7e51