fix common

Change-Id: I92cd6c6825015e1d9dafd764c9ad2614e44ec226