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

Change-Id: Ic300b58ffc6332adc7830f63cccc78cc0516d2c6