Merge "Remove backwards compatibility for old system properties."