Merge "RepoPick: Actually skip merged commit instead of exiting" into cm-11.0