[PR5161]Fixing up issue with broken ui suite.
Merge pull request #5355 from lokeshchdhry/PR5161

[PR5161]Fixing up issue with broken ui suite.