Merge "Fix intermittent crash in property_service_test"
am: ca26cbc5d3

Change-Id: Ieaa5218faf9deee0443b88fff6be43d4a0877ec9