Merge "Marked #testCancel_sneakyCancelBeforeUpdate as flaky."