Merge "Do not use hidden API SystemProperties.set"
am: 622cf3787d

Change-Id: I2dbae4dd373787b2b1a9396ab26a0a39cffd96ee