fix common

Change-Id: I1c27233333f2c5470b865c0abee7aca11ff8df34