Fix for UI casper tests

Change-Id: I2fcfde273fedd4bcac83b8b7e79704b7d2db4a3d
Merge "Fix for UI casper tests"