eec2130443
This was missing from a previous commit regarding dynamically allocated static data structures. Change-Id: Iae1c674e762f85e3aebf338210ba96942ba80278