Merge "Fix NPE in ComponentNameValidator" into pi-dev
am: b105913098

Change-Id: I9725217151634a66d7cd3dc0e80acb5f78f15c39