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