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

Change-Id: I89827ac2de14385d1b0e844ba40688b93d4f126e