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