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