llvm-svn: 371202 (cherry picked from commit 8455294f) Change-Id: I2e0f627abf8693030a71b3cbae32a1bfcdc2b51a