Modified SystemProps

Change-Id: I604fc8b2b5a1fc59c14dab1787e9be4980bfce7c
Modified props

Change-Id: Ic6394f54f28e54c615624e32b9b7a56104d834f9