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