fix #2404: branching and include_contents='none'#2961

ananyablonko wants to merge 5 commits intogoogle:maingoogle/adk-python:mainfrom

ananyablonko:mainananyablonko/adk-python:mainCopy head branch name to clipboard