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