Merge "Remove unused system properties"
am: fd0426d438

Change-Id: I6f33268a640fb14ec8e9cd2fc5acec94ac25697d