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

Change-Id: I7f1c821d81beba51f9f6065142c79ba302a7c4a3