Merge "Fix a misleading warning message about sysprop overriding"