tick sched: fix merge issue

Change-Id: Iaf3447644d0da350857def4694b38ff88af80adb