Merge "Merge "Validate custom pointer icons aren't null." into cw-f-dev am: 05b2d3eb0d am: 24a1667145" into nyc-mr2-dev-plus-aosp
am: 6497bf0e58

Change-Id: I92deab86f5a1a41008c7e18de77c0ae5ff169bfc