Merge "Decoder: Fix in the case of MMCO 6" into mnc-dev am: 6b3d20c0 am: 4bbbcfe7 am: ccbbaa64 am: e3e6c70c am: 8757210a am: c11fe0ec Change-Id: Iac0d36f55607412d425adb93a9cc93271cc5d63e