t6-common: not sure why I had to merge &
lost this commit

Change-Id: I0184683276cce00a853b5f61eb6300f0363d368c