Merge "Fix ApiWatchTest"