Change-Id: I49723f2abfe52982d767d5b1fa6461e1dd223a41 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>