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