Merge "Revert "Revert "Prevent UAF issues caused by static destructors"""
am: 4362822326

Change-Id: If6b69817c374c17bf00450213e9de3bd20a84fc3