Unreviewed test expectation updates following r117815.