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

Change-Id: Id399c80f1559f14a9e14bc2db013717c54d28aeb