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

Change-Id: If200a6f4ca5556c367fb427b93e580d3bb2a39a6