Merge "Fix SharedLibrariesImplTest" into tm-dev