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