Merge "Fix function signature to match callback type."
am: d4bd50049d

Change-Id: I4ab8287420b9f425df164fbdee3eb87e9f7f87a1