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

Change-Id: I111f172e269c9541bb98d7d742c27dae77afa048