Merge "Remove unused SystemProperties.set" am: 3831174548 am: ec7c91a9c0

Change-Id: I67edd305fe8b98ab52b358d9c3c4d63971147bd7