Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." am: 146dde2a0c am: 37de3bd13a

Change-Id: I554b14e93578806de734fcc1ec292b4087e11862