Get rid of two runtime static destructors am: 0cd8012b73 am: 4b7d0625ac am: 70a9620be6

Change-Id: I82dc71bae94c52e07b3dadbf8cc59830e7cae10b