Change-Id: I3c3455f411f18322a062f144e98461691d12ada8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>