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

Change-Id: Id01a6942ecb7280a943395f139f6b3dbf9473782