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