Merge "Remove unused SystemProperties.set"
am: 3831174548

Change-Id: I2bc6feb14fd3a47f36b58115491909abdf57a1b9