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