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

Change-Id: I3a9b89f4c64d1129ea59a0144937832d93ed81fd