Merge "Trival: Remove unused logging import in some files"