resolve in two steps

Change-Id: Ie2b3337371547785b53eb4a72551c62a368705b3
increased swtbot timeout

Change-Id: Ic38ec5842ca80f22804af655c396797296843826