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