Merge "Updating shared lib ref to new class."