Change-Id: I7f29515d903cb1109f2c15c2d36cf43b77285c4f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>