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

Change-Id: I9790b33b6515c3afbc6d80443b21c4baf63d52c4