Rejected r204899 and r204900 due to remaining test failures on cmake-llvm-x86_64-linux buildbot.