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

Change-Id: I848a33152da3f5d4414ec8f127ddd14fbf9bcf7f