required to accomodate different versions of encoders Change-Id: I47c574f1a8761b0ba042532145548e87d4398b75 (cherry picked from commit f0b4f1d9a9)
f0b4f1d9a9