Merge "New protocol for property_service" am: 038b8f086f
am: 8077c96655

Change-Id: Icfd892a8f756e85b0992ab4b8b40b196c07f2aa1