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

Change-Id: I29cf259041a2cf5fc3715476d17add5e1ce68797