Merge "Decoder: Fix in the case of MMCO 6" into mnc-dev am: 6b3d20c032
am: 4bbbcfe76d

Change-Id: Ibfdeb1e6635693f1b9519e0a9959de18d06a85d0