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