Merge "bug fix: configure input port buffer size" into oc-mr1-dev
am: 97d68ba8f2

Change-Id: Ibc6bedef5de70232f7840a1ef7336ae2c40a0a18