Merge "Properties: remove sanitizers"
am: 85abdb5df7

Change-Id: I6ea3798c9f05827644e8a697498739edcb3ab57c