Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev am: 1a31586918
am: b37470ff6d

Change-Id: I57791d3bb1ba5d22bde6d15adad54ba79b97552f