[automerger skipped] Merge "Add feature to disable slices" am: fa871a36 am:...

[automerger skipped] Merge "Add feature to disable slices" am: fa871a36 am: 2b554fa9 -s ours am: f89dda5a -s ours am: afd94c6d -s ours
am skip reason: Change-Id I090b4c1460fcc4784e9e901847829ee61bfc31ef with SHA-1 95862c57 is in history

Change-Id: I5b0196bf7047e75aee1f620dc09ee50f883a10b2