ComponentName null check MUST proceed before creating ComponentKey.
am: d3bf9803f5

Change-Id: If723a18616d444ea51ca054f226318bfdcce4429