Merge "Merge "bug fix: configure input port buffer size" into oreo-vts-dev am: ccc3c36c88  -s ours am: fcaa3c4dbe  -s ours" into oc-mr1-dev