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