Validate custom pointer icons aren't null. am: 35068079c8
am: 92f7fab9f6

Change-Id: I996d08fd61f3c64936088251e851cdf30899b3e8