Volcano Bot

Results 2 issues of Volcano Bot

Manual cherrypick required. #4759 failed to apply on top of branch "release-1.12": ``` Patch is empty. When you have resolved this problem, run "git am --continue". If you prefer to...

Manual cherrypick required. #4731 failed to apply on top of branch "release-1.13": ``` Patch is empty. When you have resolved this problem, run "git am --continue". If you prefer to...