Fix potential NPE in cherry-pick submit strategy

Change-Id: I0099d9a73a3f5e86c77235668bc0fc1205979456