[automerger skipped] Merge "Remove unused system properties" am: fd0426d438 am: c3eb0887b0
am: 9d78bf6557  -s ours

Change-Id: If0f0c9b5a3ad48272ff626d666b7a27c116bbeee