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