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

Change-Id: Ia130a3da87cb85b610663df71e2de6f32f8b0426