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