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