Merge "Make test testStopRecur in test 1934 not throw SOEs"
am: 44f520b12b

Change-Id: I3114be272fa5a8f91b29d36e5d5fe903a9aa1fa6