Merge "bug fix: configure input port buffer size" into oc-dev am: bc769a7e5a
am: 2eedb46745

Change-Id: Ic30a77e7f4bfaf9e249e10e4916c1452defacb9b