Merge "Revert "Revert "Prevent UAF issues caused by static destructors""" am: 43628223 am: 9ae4fd17 am: 117594b5 Change-Id: I16d6c598a03d5e5a4d2306dbf299dd1873f26b61