Change-Id: Id45cc17df1cb941ad0e09ecb6d7936dacac24755 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>