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