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