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