Revert "Support7Demos: Enable the route discovery action only when needed"

This reverts commit c1a24039658cc52f34046800790de302b7db075b.

Test: manual
Change-Id: I5c6691615ee8ffef1a7343375dc61bf5634feedb
2 files changed