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