And add a watchlist for the C++ API.

Change-Id: Id82d7191153afe701fc11958ba36ce7a8b29bef2
Reviewed-on: https://chromium-review.googlesource.com/764548Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49309}