Merge "New protocol for property_service"
am: 038b8f086f

Change-Id: Ica1faa48b08b638ab9a77cb29d5d74a74fd0071e