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

Change-Id: I71f7aa36f1ec7b2ece32f47fee397dff178e7b17