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