Merge "Adapt for update to clang-r399163."