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

Change-Id: Iee1c020eac44c963440bf3382c723ba4f4832c22