Updating trunk-tracking against PSOL r3130.

Small fix for compilation error caused due to removal of all synchronous fetchers in r3128.