Merge "Revert^6 "Prevent UAF issues caused by static destructors"" am: 7c16fea9ba
am: 66b87f64fd

Change-Id: Ib4ddd4af01f01d6d2f4a6b16edad05186eaa4a09