Removing deprecated watcher ui.
Renaming v2 to original name.
Changed script to match original.

Bug - 345379812
Test - NONE
Flag - EXEMPT No code change in android

Change-Id: I09cb66eff19cbbee351adf42fdd232dd334d6bf3
115 files changed