Merge "Remove invalid uses of -l and -I"