Get rid of two runtime static destructors am: 0cd8012b am: 4b7d0625 am: 70a9620b am: 19569c7b Change-Id: I01431e3dca1afd2f26084e8205db31c21f3998e7