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

Change-Id: I3b33f1a956036236bf3db4035346216b46f1acec