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

Change-Id: I9fbf408cd8053e6972eefd32b08cf2ff543ef018