Merge "Revert "Throw IllegalArgumentException when calling""