Merge "Fix NPE in ComponentNameValidator" into pi-dev