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

Change-Id: I1b571cb4a2d71abe5d4fa22cbd6d342f8ae1dfd2