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

Change-Id: I061172ceec21de8ed9d3ec05a9af7b0d97dbd285