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