Get rid of two runtime static destructors am: 0cd8012b am: f1c0eeb8 am: b16a7169 am: 001e15a0 Change-Id: Ia475dadba9fb50cfb92530201b6d5d3873d338c5