Merge "Add IllegalStateException with packageName on null info" into sc-dev