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

Change-Id: Ic7f2d3565fa4cd1396226d6ef7782e6985de048e