Merge "Remove all system properties references"