Merge "Add feature to disable slices" am: fa871a3642

Change-Id: I7b64d2b937a0ebe183440c430514e821e1174faf