Merge "updater: Skip an updated partition on retry." am: 0ffe13b56f am: 83906f75bb
am: 6ca5e0c252

Change-Id: I99dd9c4edd5320515bda1db2d229f11c9ad9507f