Merge \\\\"Decoder: Fix slice number increment for error clips\\\\" into mnc-dev am: 2e88a2aa67 am: d75185f90e am: abd921f407
am: 46635d205b

Change-Id: I33ae1d1daeb6b7ca83a7ce4913e6b7f40ca87283