Merge "Properties: remove sanitizers" am: 85abdb5df7 am: aaf0c0a0c8
am: 224bdcb19f

Change-Id: Ia8742c0d054a9232c2daec5c29e86d292cbb3d40