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