Merge "Remove unused SystemProperties.set"