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

Change-Id: I16d6c598a03d5e5a4d2306dbf299dd1873f26b61