adding hafnium and removing ocg1-3

Change-Id: I7756688881dc11ce582e6a58c04ef4843496ddce