Bug 1402485: Integrate the watchlist install stuff into the normal install process

Change-Id: I49cbd9196efca256bb0959e59dfc56aa2ba4e4e2
Merge "Bug 1402485: Integrate the watchlist install stuff into the normal install process"