[automerger skipped] Merge "Add feature to disable slices" am: fa871a3642 am: 2b554fa9d4 -s ours am: f89dda5a11 -s ours am: afd94c6d2b -s ours am: 940bc3b164 -s ours
am skip reason: Change-Id I090b4c1460fcc4784e9e901847829ee61bfc31ef with SHA-1 95862c5724 is in history
Change-Id: I60c6927b6da559eaa5e501851a2ff987017777a9
This commit is contained in: