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

Change-Id: I4cf2e0d4fe4e88f20ca801caa6bc7bff970fedc4