Modified SystemProps

Change-Id: I604fc8b2b5a1fc59c14dab1787e9be4980bfce7c