Add autodiscovery form

Change-Id: I00b5685ddae7b45d564ff8f756beee3a1fca94ef
Merge "Add autodiscovery form"