Removing duplicate common construct layouts

Change-Id: Ic5294dad87c67a824fa470e6a4ede34fcedd8262