Merge "Revert "Revert "Revert "Prevent UAF issues caused by static destructors""""
am: 30ca8e35c5

Change-Id: Ica89ff621babf82c88e4047fb385ef77c891b035