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

Change-Id: Ia81418e6816385edcdbb9d6a79e8412947e42285