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