Merge "Fix falkiness in 117-nopatchoat"