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

Change-Id: If31bb64ed4da5a773cc32b5a33e93ea85acda776