Common:Fix variables

Change-Id: I18c6bd785cf0d0bfe00dc07070766559cd788a6b