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

Change-Id: Ie11861c092b9dd955b2680bfeed5129d46d036a1