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

Change-Id: I073b3949155a847a0564c3085d8c614cc15b06dd