Make AFTv5 watchlist configurable

Change-Id: I65568456a23f2b0d54ccc254caaa24c1551b5506
Merge "Make AFTv5 watchlist configurable"