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