Unxfail tests affected by Bug 906933

Some tests affected by Bug 906933 started passing in Jenkins and locally.

master -> Merge.
v1-train -> No.