Merge "Fix slice decrement for skipped slices" into mnc-dev am: d743ed23ff
am: 5109aa40af

Change-Id: I924d90f821dd1d9bf73775731cb6dc3adbe0bfbc