Add support for cherry-picking to a branch

Change-Id: I50fc591226f15505daf1bb5d954be4a9e00a39b5