Merge "Fix intermittent crash in property_service_test" am: ca26cbc5d3
am: f157725091

Change-Id: If6f95cec386cb4351abfa08f6c85ce6ac3846fb4