am 299b2eec: am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."

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