Bug 51458: Allow watching outside main namespace

Bug: 51458
Change-Id: Ie855c05bda0fe0a44767874b32d003e8c6928729
Merge "Bug 51458: Allow watching outside main namespace"