Merge "Clean-up pass over support lib modules"