Merge "Revert "Revert "Revert "Prevent UAF issues caused by static destructors"""" am: 30ca8e35c5 am: f55c60dff3
am: ecff808fab

Change-Id: I79e25638e5af2fb5dc29756daf94abc5283419ff