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

Change-Id: I1feaec76dbb7791b3cf1f724f73e398e907e0706