Merge "Make StopRecur test hardened against move-exception"
am: d9f97406f6

Change-Id: I553ff8462e43b4fcd8f425432846e8e7205b34c7