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