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

Change-Id: I2b51b3a87e3d5a194b877806c2f1c2311f410ce5