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

Change-Id: Ie87d948355b54569b4215efd66986ef1a88efdd7