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