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

Change-Id: Ic49186056e830ac1edbe299fc35ced4105f2690c