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

Change-Id: I3f52107258fa54a611ad051917c17a3bcbb53de6