Align hevc related code with #5493