and make it statically allocated, no point in dynamically allocating
such a small object

Change-Id: If476bf5dc1e0d535383d16bc49c8d567776f16cd