Fix fatal on watchlist

Bug: 73074
Change-Id: If914a36c097f1df81ac9d5e12052dbcbeca5bd55
(cherry picked from commit 07e766885f1a5c0e857bf1d1adac50f7774dc50c)