Merge "Reland "Have property_service create a serialized property_contexts file"" am: 432cca5c32 am: 705cbc7562
am: d9cc74dce6

Change-Id: I63672bfd99b7e63a39e4c3136e74842e04e67279