Merge change 20982

* changes:
  SystemProperties: eliminate unnecessary string allocation.