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