Merge "Remove clang-4691093"