Track changes from clang r212388