Fix random stop of polling of deployment status

Change-Id: Ice4b5dbea047889ee59ef3fa8d51b1e00967504a
Closes-Bug: 1338573
Merge "Fix random stop of polling of deployment status"