moved to common

Change-Id: Ib62513da9d9a91bf80c63efbc6bd4f165d2d49f8