This recommits 7f1f89ec and 40df06cd with bug fixes for memory sanitizer failure and Tensile build failure.