Merge b4ace5f3454 for LLVM update to 346389

Change-Id: Ibead9b00d6d5268da6ebfeaf38009372c30f6bd5