Merge "TestOnly: reduce duplicated start/stop hotspot verification"