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

Change-Id: I8809512dbb44f9f496a62d1fdf187d757b5a9602