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