Merge "Do not throw IllegalArgumentException in slice manager." into pi-dev