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