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

Change-Id: Ibd3fd9fee1041d9395496925153c57e7db8c5797