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