Null check when reconstituting legacy icon data.

Bug: 21353798
Change-Id: I07f6c7310d4589128b175759f737cf902585f97e
1 file changed