Merge branch 'stable-3.3' * stable-3.3: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: Ib2216e3b06ea62cb06c22ad955a8c252f3bacccc