Merge "Revert "New protocol for property_service""
am: 17767caed9

Change-Id: I59613b73239d70216fbbe505f48dc913308c4dd0