Merge "Remove usage of predict buffer for decode"