Needed after dlclose revert. This reverts commit b408e583. Change-Id: I0a83af2462f5a51b12d6ee97d70f62b44e487dd5