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