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

Change-Id: Idf71f7b7bf9740d040ec8c0c06fc5aa77a76c119