Merge "Revert "Revert^4 "Prevent UAF issues caused by static destructors"""
am: 0fdd49b0c5

Change-Id: I8d7103ded35c697cba8fbe687f73631d8a61106c