Merge "Change Encode output port Buffer size" into gingerbread