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