am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files"

* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
  Allow several system property files