Merge "Prevent UAF issues caused by static destructors" am: 7d522a4447
am: 780d12c241

Change-Id: I2acb7e8159d385bb09b88ac7d123e2d1e78dbab8