Merge "updater: Fix an issue when resuming an update." am: 1dc9e2ddef am: 47bf5e68e6
am: 13784d1511

Change-Id: I2bf115ee8c4a77c6097e6e52e0ec2ef9b5f73f72