[automerger skipped] Merge "Remove unused SystemProperties.set" am: 3831174548 am: ec7c91a9c0 am: aeed5d8159 -s ours
am skip reason: Change-Id I47239b57bbbd37695fba5a37cc64b78428189a31 with SHA-1 debb4616ef is in history

Change-Id: I2049138c15f96bcc2407d2565686065cad78d164