Merge "Do not use hidden API SystemProperties.set"