Merge "Make StopRecur test hardened against move-exception" am: d9f97406 am: 9085f63a am: 725e7f3c am: c8cfe258 Change-Id: I3cf1176cf747f58a17a8b5f448c9f75e4de4ea21