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

Change-Id: Idb50559df82b4ee0786f2573ece8cdfb887785ae