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

Change-Id: I801371cbce35e701996710d4110c6b3d28705e18