Merge "Fix the system property name in a comment"