Fixed init files on Wave 2

Change-Id: I86103d0f1a5e712f72c6e9dcc7dd3d98f2def1c1