
This reverts commit 888a58fd2a62628d970e7088d4f74e4642bacc17. Will restore it once related changes in watcher get merged. Change-Id: Icdde1678598867c5e1ce68c8bd4c189f7a37bedc Closes-Bug: #1595368
This reverts commit 888a58fd2a62628d970e7088d4f74e4642bacc17. Will restore it once related changes in watcher get merged. Change-Id: Icdde1678598867c5e1ce68c8bd4c189f7a37bedc Closes-Bug: #1595368