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