Merge "Fix a race in system properties."