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