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

Change-Id: I7cc789a4b548e19077559799096e927d44ffdbb0