Merge "Revert "Have property_service create a serialized property_contexts file""
am: 212257dbb9

Change-Id: I7abb8a974d0cec9ba7a200e274d0182c78a4a990