[msan] Add changes missing from r177065.