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

Change-Id: I02ce106bc4cc605d1d48021d78bc3d55d85abbb9