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

Change-Id: I62f25da7bbbe57f48a5adb9568248a5d7a7b8974