am c383c6d1: Merge "Add "import" support to system property files."

* commit 'c383c6d1d8b0541d18924c3ef63df9061ee5bd8f':
  Add "import" support to system property files.