Add option for auto cherry-picking

Change-Id: Ifbb195cdec499b999383d99e3caddac1fa1c0a10