Prevent against NPE inside ComponentKey
am: ada6cbe4ef

Change-Id: I63b1286901979479aa2f88ae26107a5313a4d224