Merge "Increase stack size for tests 1917 and 1934"