Merge "Replace deprecated import of ABCs from collections"