Follow our own fusion3-common

Change-Id: Iadbbf4cc78b6dd4d88fa15ffcf2c41441cac63f5