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