Merge "PropertyService: Exclude sanitization for darwin" am: 5a7a8f2f17 am: 040b849f5a
am: 01d62bf347

Change-Id: Ie3aa80fa55d3fb3d35be3a329940e9343c20e191