Merge "Do not reinitialize system properties to fake their values" am: 8cd8c8dd98
am: db701fd510

Change-Id: Iff185226514c74f80ea1113dbd1afa78c8243da6