do not merge: Cherry pick change I878192090 from master.

A test for system properties

Change-Id: Id28da70b8e333ca83129c2b7b7aed2ddf9adf51c
4 files changed