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

Change-Id: I7275d281f4770ea869473dfec0242ddffa34c550