Merge "Increase stack size for tests 1917 and 1934" am: 537dd4a3c0
am: 0500f017b1

Change-Id: I5ecf1f19b826128acef52265ae42e7d0bcab1c31