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