This change does affect encoder nor the bitstream Change-Id: I516e4750c5df6cb0e288365f78dd4875510548f4