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

Change-Id: I226456cce50952753e209265a58c386d321de7fa