Merge "Do not use hidden SystemProperties.set"