Code needed for Selenium tests

Change-Id: Iddc361509401078121acc5efc764b1c55fbc48c3
Merge "Code needed for Selenium tests"