Cherrypicks Watcher

Design doc is here.