Merge "Add "import" support to system property files."