Ability to retry patching

Closes-Bug:#1365464

Change-Id: I2b46d24fc8de2cd9163ad512e07b9d53c99213a6
Merge "Ability to retry patching"