Merge "Remove clang-r344140"