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

Change-Id: I064b4ea247a6c22544f789f041194e510dfca0b3