Propagating prior merge from 'llvm.org/release_50'.