Fix type mismatch with timer callback signature. am: 24d616fd34
am: 8560a384a8

Change-Id: I4365a5ba91874d2f07dcc34068be8e298a6c948c