Merge "Adapt to clang-r383902"