Merge "Break shared library adds into populate and modify"