In case of conflict, reset to initial state by aborting the cherry-pick, leaving the working directory clean Change-Id: I2353b92254b67ea49835bc88b6fc9bc3910b5107
In case of conflict, reset to initial state by aborting the cherry-pick, leaving the working directory clean Change-Id: I2353b92254b67ea49835bc88b6fc9bc3910b5107