Merge "Remove dependency on SystemProperties.set" into main