optimized use of system properties

Change-Id: I9b30aa1209d4f060bd6c14bef64e16c4a427b53c