Merge "Use SystemProperties.get() instead of System.getProperty()"