Merge "Validate custom pointer icons aren't null. am: 35068079c8 am: 92f7fab9f6" into nyc-mr2-dev-plus-aosp
am: e97ec8ca9d

Change-Id: Ib199cbf80ca2f8711f8968989f2cffe9dbffec7e