Validate custom pointer icons aren't null. am: 35068079c8
am: 4bb5848a93

Change-Id: Ic2110ae6c123982601f5d27d47ededf904c97783