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 am: 9200ba74 am: bdb0d589 am: c779300b Change-Id: Ica023d004f0dd9997c695fd124c1de32e03f0571