[automerger] Merge "bug fix: configure input port buffer size" into oreo-vts-dev am: ccc3c36c88  -s ours am: a72601c004

Change-Id: I5a4f21006aa7fc63b2f5d204a969487e4e450cd5