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