Merge "Revert "Revert "New protocol for property_service""" am: 5a32cc9911
am: 4a0f6f867e

Change-Id: Ifcadf064ca100b5eb127f4579e7fe8a4413872af