Merge "Remove the usage of SystemProperties.set()"