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

Change-Id: I5ea36c9ed5759aa89db41ce6ab8f1465805c4840