Merge "Move system property rules to private"