Merge "Revert "Revert^4 "Prevent UAF issues caused by static destructors""" am: 0fdd49b0c5 am: a5af55f516
am: 88c1208261

Change-Id: I5fc52a4b7c817513a511b1924f2d39b0bee3c2ff