Merge "Update getWithSetCallback() callers to the newer signature"