Fix fatal on watchlist

Bug: 73074
Change-Id: If914a36c097f1df81ac9d5e12052dbcbeca5bd55
Merge "Fix fatal on watchlist"