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

Change-Id: I75e609151f85d5198c61048e05fb8307b05d2149