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

Change-Id: I1a6a92fcad7f18275d55da0baf9cb4ac21a58094