Merge "Remove redundant buffer initialization and mode_info assignments"